commit 80c9fae6aa8638e192e5b622d12305b304890b43
author Mike Kaganski <mike.kaganski@collabora.com> Fri May 29 10:53:47 2020 +0200
committer Mike Kaganski <mike.kaganski@collabora.com> Sat May 30 20:49:16 2020 +0200
tree e8ad75c5a79ccf4fdf2077d6e51a70ecd59766ec
parent 270005fe2fb594d1894305c742f98b53367f4dd3

tdf#133365: only release solar mutex on Windows

Regression after f2561331534459f8aebc57e8615fa5f626521bcb

Change-Id: Id12a81b2ca79edb7ae056b357dcfd1d8f4bb56ef
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95088
Tested-by: Jenkins
Tested-by: Xisco Fauli <xiscofauli@libreoffice.org>
Reviewed-by: Jean-Baptiste Faure <jbfaure@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>

vcl/source/treelist/transfer.cxx

diff --git a/vcl/source/treelist/transfer.cxx b/vcl/source/treelist/transfer.cxx
index 965d820..8ff088d 100644
--- a/vcl/source/treelist/transfer.cxx
+++ b/vcl/source/treelist/transfer.cxx
@@ -1442,9 +1442,12 @@
                {
                    if( ( nRequestFormat == format.mnSotId ) && !rFlavor.MimeType.equalsIgnoreAsciiCase( format.MimeType ) )
                    {
// tdf#133365: only release solar mutex on Windows
#ifdef _WIN32
                        // Our own thread may handle the nested IDataObject::GetData call,
                        // and try to acquire solar mutex
                        SolarMutexReleaser r;
#endif // _WIN32

                        if (xTransfer2.is())
                            aRet = xTransfer2->getTransferData2(format, rDestDoc);
@@ -1459,9 +1462,12 @@

            if( !aRet.hasValue() )
            {
// tdf#133365: only release solar mutex on Windows
#ifdef _WIN32
                // Our own thread may handle the nested IDataObject::GetData call,
                // and try to acquire solar mutex
                SolarMutexReleaser r;
#endif // _WIN32

                if (xTransfer2.is())
                    aRet = xTransfer2->getTransferData2(rFlavor, rDestDoc);